Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 16:48:33 +0000 (09:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 16:48:33 +0000 (09:48 -0700)
commit41cba2ecc254346a2a27bbc2257ca9625a64b006
treeffedb05cbc1613a17303bbed6638b7c598c5408e
parent7248c84cd2946d75e6fa4b5961d389e1492c51c1
parent2b75078cb9be3cdc46ee4fcb5d293d87f1da1288
Merge from trunk.